bitkeeper revision 1.1023.1.1 (40e03f1bPmzhat3TADzDm52SSYDIUw)

Merge.

diff --cc .rootkeys
Simple merge

diff --cc BitKeeper/etc/ignore
index 9f50e7eaedfd448d283fa81e67e02c14853b9a3e,5db69fd7ef1f49835b7d653563c57ceca6688444..0d23e1bd2dca03f172f89ca3f4e19c12ab6e7f6b
--- 1/BitKeeper/etc/ignore
--- 2/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@@ -3,8 -3,7 +3,8 @@@
  *.pyc
  *.so
  *.so.*
- *.tar.gz
 +*.tar.bz2
+ *.tar.gz
  *~
  BitKeeper/*/*
  PENDING/*
@@@ -12,24 -11,41 +12,43 @@@ TAG
  extras/mini-os/h/hypervisor-ifs
  install
  install/*
- patches/*
 +linux-*-xen*/*
+ linux-2.4.26-xen/*
  linux-xen-sparse
++patches/*
  tools/*/build/lib*/*.py
  tools/balloon/balloon
  tools/misc/miniterm/miniterm
  tools/misc/xen_cpuperf
  tools/misc/xen_log
  tools/misc/xen_read_console
 -tools/xentrace/xentrace
 -xen/drivers/pci/classlist.h
 -xen/drivers/pci/devlist.h
 -xen/drivers/pci/gen-devlist
 -xen/include/asm
 -xen/include/hypervisor-ifs/arch
 -xen/include/xen/compile.h
 -xen/tools/elf-reloc
 -xen/tools/figlet/figlet
 -xen/xen
 -xen/xen-syms
 -xen/xen.*
+ tools/xc/lib/.allocate.o.d
+ tools/xc/lib/.file_stream.o.d
+ tools/xc/lib/.gzip_stream.o.d
+ tools/xc/lib/.iostream.o.d
+ tools/xc/lib/.sys_net.o.d
+ tools/xc/lib/.sys_string.o.d
+ tools/xc/lib/.xc_atropos.o.d
+ tools/xc/lib/.xc_bvtsched.o.d
+ tools/xc/lib/.xc_domain.o.d
+ tools/xc/lib/.xc_evtchn.o.d
+ tools/xc/lib/.xc_io.o.d
+ tools/xc/lib/.xc_linux_build.o.d
+ tools/xc/lib/.xc_linux_restore.o.d
+ tools/xc/lib/.xc_linux_save.o.d
+ tools/xc/lib/.xc_misc.o.d
+ tools/xc/lib/.xc_netbsd_build.o.d
+ tools/xc/lib/.xc_physdev.o.d
+ tools/xc/lib/.xc_private.o.d
 +tools/xentrace/xentrace
 +xen/drivers/pci/classlist.h
 +xen/drivers/pci/devlist.h
 +xen/drivers/pci/gen-devlist
 +xen/include/asm
 +xen/include/hypervisor-ifs/arch
 +xen/include/xen/compile.h
 +xen/tools/elf-reloc
 +xen/tools/figlet/figlet
 +xen/xen
 +xen/xen-syms
 +xen/xen.*

diff --cc tools/xc/lib/xc.h
index ca092975ceaf36f43c8082208892db452014ceb7,adef112dbd4e0308495832c3155a6513f08784bf..f9692607bd3194254c43186c51b07b67e01bc83d
--- 1/tools/xc/lib/xc.h
--- 2/tools/xc/lib/xc.h
+++ b/tools/xc/lib/xc.h
@@@ -75,18 -68,10 +75,9 @@@ int xc_shadow_control(int xc_handle
  #define XCFLAGS_LIVE    2
  #define XCFLAGS_DEBUG   4
  
- int xc_linux_save(int xc_handle,
-                   u32 domid, 
-                   unsigned int flags,
-                   int (*writerfn)(void *, const void *, size_t),
-                   void *writerst);
- 
- int xc_linux_restore(int xc_handle,
-                      u32 domid,
-                      unsigned int flags,
-                      int (*readerfn)(void *, void *, size_t),
-                      void *readerst,
-                      u32 *pdomid);
+ struct XcIOContext;
+ int xc_linux_save(int xc_handle, struct XcIOContext *ioctxt);
 -
+ int xc_linux_restore(int xc_handle, struct XcIOContext *ioctxt);
  
  int xc_linux_build(int xc_handle,
                     u32 domid,

diff --cc tools/xc/py/Xc.c
Simple merge

diff --cc tools/xen/xend
Simple merge